From dc898e3f84a9cf96f89e7708a601b4b299e9a34b Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 3 Sep 2011 23:59:40 -0400 Subject: [PATCH] GtkLabel: make patterns work a little better When a pattern has been set, we must not throw away the attributes that contain it. https://bugzilla.gnome.org/show_bug.cgi?id=658111 --- gtk/gtklabel.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index 0bb962c1ac..70b513eab0 100644 --- a/gtk/gtklabel.c +++ b/gtk/gtklabel.c @@ -250,7 +250,7 @@ struct _GtkLabelPrivate gdouble angle; - guint mnemonics_visible : 1; + guint mnemonics_visible : 1; guint jtype : 2; guint wrap : 1; guint use_underline : 1; @@ -2098,17 +2098,17 @@ gtk_label_recalculate (GtkLabel *label) if (priv->use_markup) gtk_label_set_markup_internal (label, priv->label, priv->use_underline); + else if (priv->use_underline) + gtk_label_set_uline_text_internal (label, priv->label); else { - if (priv->use_underline) - gtk_label_set_uline_text_internal (label, priv->label); - else + if (!priv->pattern_set) { if (priv->effective_attrs) pango_attr_list_unref (priv->effective_attrs); priv->effective_attrs = NULL; - gtk_label_set_text_internal (label, g_strdup (priv->label)); } + gtk_label_set_text_internal (label, g_strdup (priv->label)); } gtk_label_compose_effective_attrs (label); -- 2.30.2